Merge remote-tracking branch 'savannah/master' into HEAD

author Andrea Corallo <akrl@sdf.org>

Mon, 23 Mar 2020 20:38:07 +0000 (20:38 +0000)

committer Andrea Corallo <akrl@sdf.org>

Mon, 23 Mar 2020 20:38:07 +0000 (20:38 +0000)
author Andrea Corallo <akrl@sdf.org>
Mon, 23 Mar 2020 20:38:07 +0000 (20:38 +0000)
committer Andrea Corallo <akrl@sdf.org>
Mon, 23 Mar 2020 20:38:07 +0000 (20:38 +0000)
diff --cc src/data.c
Simple merge
diff --cc src/eval.c
Simple merge
diff --cc src/lisp.h
Simple merge
author	Andrea Corallo <akrl@sdf.org>
	Mon, 23 Mar 2020 20:38:07 +0000 (20:38 +0000)
committer	Andrea Corallo <akrl@sdf.org>
	Mon, 23 Mar 2020 20:38:07 +0000 (20:38 +0000)
		1	2
src/data.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/eval.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history